Make 'gb.pdf' compile with poppler >= 26.1.0.

[GB.PDF]
* NEW: Make 'gb.pdf' compile with poppler >= 26.1.0.

Origin: https://gitlab.com/gambas/gambas/-/commit/78bf774fa00b07194ba24efa7fa0e989e5271e2a

Gbp-Pq: Name Make-gb.pdf-compile-with-poppler-26.1.0.patch

diff --git a/gb.pdf/configure.ac b/gb.pdf/configure.ac
index 0ed70ba911e44a7c315299234a60ba2a18aab0be..c567fe67f663da34ed20d2391148c263144ab6d2 100644 (file)
--- a/gb.pdf/configure.ac
+++ b/gb.pdf/configure.ac
@@ -46,6 +46,8 @@ if test "$have_poppler" = "yes"; then
   AC_DEFINE_UNQUOTED(POPPLER_VERSION_25_01_0, $((1-$?)), Poppler version >= 25.01.0)
   $PKG_CONFIG --atleast-version=25.12.0 poppler
   AC_DEFINE_UNQUOTED(POPPLER_VERSION_25_12_0, $((1-$?)), Poppler version >= 25.12.0)
+  $PKG_CONFIG --atleast-version=26.01.0 poppler
+  AC_DEFINE_UNQUOTED(POPPLER_VERSION_26_01_0, $((1-$?)), Poppler version >= 26.01.0)
 fi
 
 AC_CONFIG_FILES([\

diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
index b08e55282a61665a0f6591de447f3e7cbf758459..0041ac8f805bb25d39003eaf6bf024c019f19fc3 100644 (file)
--- a/gb.pdf/src/CPdfDocument.cpp
+++ b/gb.pdf/src/CPdfDocument.cpp
@@ -1061,7 +1061,11 @@ BEGIN_METHOD(PDFPAGE_select, GB_INTEGER X; GB_INTEGER Y; GB_INTEGER W; GB_INTEGE
        THIS->page->display(gfx);
        dev->endPage();
 
-       str=dev->getText((double)x,(double)y,(double)(w+x),(double)(h+y));
+#if POPPLER_VERSION_26_01_0
+       str = dev->getText(PDFRectangle((double)x,(double)y,(double)(w+x),(double)(h+y)));
+#else
+       str = dev->getText((double)x,(double)y,(double)(w+x),(double)(h+y));
+#endif
 
 #if !(POPPLER_VERSION_24_12_0)
        delete gfx;